API: Add gdk_window_get_display()

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 6ce536daaa63001eb3f1086bd0c986a480e66ada..3b12f7ff5953b9a71b41256274ca4230a1594588 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -360,6 +360,7 @@ GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
 gdk_window_get_window_type
+gdk_window_get_display
 gdk_window_get_screen
 gdk_window_get_visual
 gdk_window_at_pointer

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index a776771268f372d6a90f9172914bea63c7c67876..bd4b477f72a1a93511f215668bd6b9ae030e1665 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -571,6 +571,7 @@ gdk_window_get_accept_focus
 gdk_window_get_background_pattern
 gdk_window_get_composited
 gdk_window_get_cursor
+gdk_window_get_display
 gdk_window_get_focus_on_map
 gdk_window_get_geometry
 gdk_window_get_modal_hint

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index a63dd539c3e1fca838d576f6d8a02de2e96c67a6..9dc21bcc5873ff82df3fcfedb48780e7d7394692 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2206,6 +2206,25 @@ gdk_window_get_screen (GdkWindow *window)
   return gdk_visual_get_screen (private->visual);
 }
 
+/**
+ * gdk_window_get_display:
+ * @window: a #GdkWindow
+ * 
+ * Gets the #GdkDisplay associated with a #GdkWindow.
+ * 
+ * Return value: the #GdkDisplay associated with @window
+ **/
+GdkDisplay *
+gdk_window_get_display (GdkWindow *window)
+{
+  GdkWindowObject *private;
+
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+
+  private = (GdkWindowObject *) window;
+
+  return gdk_screen_get_display (gdk_visual_get_screen (private->visual));
+}
 /**
  * gdk_window_is_destroyed:
  * @window: a #GdkWindow

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 74667ca917ef9241bdb8f215c5339424ef691b1e..b99af205e6b56f163fcfa8bd7a62244f7429ca7d 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -507,6 +507,7 @@ gboolean      gdk_window_is_destroyed          (GdkWindow     *window);
 
 GdkVisual *   gdk_window_get_visual            (GdkWindow     *window);
 GdkScreen *   gdk_window_get_screen            (GdkWindow     *window);
+GdkDisplay *  gdk_window_get_display           (GdkWindow     *window);
 #ifndef GDK_MULTIDEVICE_SAFE
 GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
                                                 gint          *win_y);